Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 18 Sep 2011 08:39:02 +0000 (01:39 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 18 Sep 2011 08:39:02 +0000 (01:39 -0700)

Trivial merge